From 27576cbfb69ffc786ae16ae95b084c1ce1901aed Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 29 Aug 2021 12:08:27 +0100 Subject: [PATCH] Disable Broadway (HTML) backend It isn't clear whether this is used in practice. If we disable it now, enabling it later if requested will not be an ABI break, but if we enable it now, we have to keep it enabled indefinitely. --- debian/libgtk-4-1.symbols.in | 11 ----------- debian/libgtk-4-bin.install | 2 -- debian/log-reftests.py | 4 ---- debian/rules | 3 ++- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/debian/libgtk-4-1.symbols.in b/debian/libgtk-4-1.symbols.in index d3fd750ead..f56f1088f7 100644 --- a/debian/libgtk-4-1.symbols.in +++ b/debian/libgtk-4-1.symbols.in @@ -9,15 +9,6 @@ libgtk-@APIVER@.so.@SONAME@ @SHARED_PKG@ #MINVER# gdk_app_launch_context_set_timestamp@Base 4.0.0 gdk_axis_flags_get_type@Base 4.0.0 gdk_axis_use_get_type@Base 4.0.0 - gdk_broadway_cairo_context_get_type@Base 4.0.0 - gdk_broadway_display_get_surface_scale@Base 4.3.2 - gdk_broadway_display_get_type@Base 4.0.0 - gdk_broadway_display_hide_keyboard@Base 4.0.0 - gdk_broadway_display_set_surface_scale@Base 4.3.1 - gdk_broadway_display_show_keyboard@Base 4.0.0 - gdk_broadway_draw_context_get_type@Base 4.0.0 - gdk_broadway_monitor_get_type@Base 4.0.0 - gdk_broadway_surface_get_type@Base 4.0.0 gdk_button_event_get_button@Base 4.0.0 gdk_button_event_get_type@Base 4.0.0 gdk_cairo_context_cairo_create@Base 4.0.0 @@ -628,8 +619,6 @@ libgtk-@APIVER@.so.@SONAME@ @SHARED_PKG@ #MINVER# gsk_border_node_get_type@Base 4.0.0 gsk_border_node_get_widths@Base 4.0.0 gsk_border_node_new@Base 4.0.0 - gsk_broadway_renderer_get_type@Base 4.0.0 - gsk_broadway_renderer_new@Base 4.0.0 gsk_cairo_node_get_draw_context@Base 4.0.0 gsk_cairo_node_get_surface@Base 4.0.0 gsk_cairo_node_get_type@Base 4.0.0 diff --git a/debian/libgtk-4-bin.install b/debian/libgtk-4-bin.install index 641d1d63d7..bca95555d1 100644 --- a/debian/libgtk-4-bin.install +++ b/debian/libgtk-4-bin.install @@ -1,11 +1,9 @@ -usr/bin/gtk4-broadwayd usr/bin/gtk4-builder-tool usr/bin/gtk4-encode-symbolic-svg usr/bin/gtk4-launch usr/bin/gtk4-query-settings usr/bin/gtk4-update-icon-cache usr/share/man/*/gtk4-encode-symbolic-svg.* -usr/share/man/man1/gtk4-broadwayd.1 usr/share/man/man1/gtk4-builder-tool.1 usr/share/man/man1/gtk4-launch.1 usr/share/man/man1/gtk4-query-settings.1 diff --git a/debian/log-reftests.py b/debian/log-reftests.py index b06c8d892f..7dc9b9bcd5 100755 --- a/debian/log-reftests.py +++ b/debian/log-reftests.py @@ -13,10 +13,6 @@ if __name__ == '__main__': 'debian', 'build', 'deb', 'testsuite', 'gsk', 'compare', 'opengl', 'x11', ), - Path( - 'debian', 'build', 'deb', 'testsuite', 'gsk', 'compare', - 'broadway', 'x11', - ), ): diff = (outputs / (node.stem + '.diff.png')) diff --git a/debian/rules b/debian/rules index 371f1fe2f5..1182e5fc17 100755 --- a/debian/rules +++ b/debian/rules @@ -91,7 +91,7 @@ configure_flags_common = \ configure_flags_deb = \ --auto-features enabled \ - -Dbroadway-backend=true \ + -Dbroadway-backend=false \ -Dman-pages=true \ -Dmedia-ffmpeg=$(media_ffmpeg) \ -Dx11-backend=true \ @@ -259,6 +259,7 @@ override_dh_install: rm -fv debian/install/udeb/usr/bin/gtk4-update-icon-cache rm -frv debian/install/udeb/usr/share/gtk-4.0/valgrind rm -frv debian/install/udeb/usr/share/metainfo + rm -fv debian/install/deb/usr/share/man/man1/gtk4-broadwayd.1 : dh_install -p$(UDEB_PKG) --sourcedir=debian/install/udeb dh_install --remaining-packages --sourcedir=debian/install/deb -- 2.30.2